Manual cherrypick of #51043 #51149
Merged
Manual cherrypick of #51043 #51149
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
the
cncf-cla: yes
k8s-github-robot
added
approved
enisoc
reviewed
Aug 22, 2017
| @@ -61,7 +63,7 @@ func TestStatefulPodControlCreatesPods(t *testing.T) { | |||
| } | |||
| for i := range events { | |||
| if !strings.Contains(events[i], v1.EventTypeNormal) { | |||
| t.Errorf("Expected normal events found %s", events[i]) | |||
| t.Errorf("Found unexpected non-normal event %s", events[i]) | |||
There was a problem hiding this comment.
These changes are from a different PR. Looks like they came in by mistake while resolving merge conflicts?
There was a problem hiding this comment.
didn't add to resolve prior to push to origin. fixed.
enisoc
added
cherrypick-candidate
release-note
…me or v1.PodSpec.Subdomain
kow3ns
force-pushed
the
cherry-pick-fix-51043
branch
from
cb5f368
to
23e671d
Compare
k8s-github-robot
added
size/M
|
/lgtm |
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: enisoc, kow3ns Associated issue: 51043 The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these OWNERS Files:
You can indicate your approval by writing |
|
/retest |
wojtek-t
added
cherry-pick-approved
|
cherrypick approved |
|
/retest |
|
/test all [submit-queue is verifying that this PR is safe to merge] |
|
Automatic merge from submit-queue |
k8s-github-robot
pushed a commit
that referenced
this pull request
Sep 27, 2017
Automatic merge from submit-queue. Allow Hostname and Subdomain to be set if empty **What this PR does / why we need it**: This PR allows the Hostname and Subdomain field of v1.PodSpec to be set when empty, and modifies the StatefulSet controller to set them when empty. For #48327: We have merged #50942 to ensure that the Hostname and Subdomain fields are set when a new Pod is created. Users should upgrade to 1.6.9 and perform a rolling restart of all Pods in their StatefulSets to ensure that these fields are set prior to an upgrade to 1.7.5. We have merged #51149 and #51044 to rollback the attempted mutation introduced in #44137. This PR allows the Hostname and Subdomain field to be set exactly once, so that when users fail to read the notes, and encounter this issue, their clusters should self heal (even though they will experience a temporary network disruption for Pods in their StatefulSets.) ```release-note StatefulSet will now fill the `hostname` and `subdomain` fields if they're empty on existing Pods it owns. This allows it to self-correct the issue where StatefulSet Pod DNS entries disappear after upgrading to v1.7.x (#48327). ```
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
StatefulSet controller no longer attempts to mutate v1.PodSpec.Hostname or v1.PodSpec.Subdomain
fixes: #51043
Partial fix for #48327
Manual cherrypick of #51044